From ed9941ec2cde3afbeee2c66d1491378819c658b7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 11 Jun 2020 18:10:42 -0400
Subject: [PATCH] printdialog: Replace some combo boxes with drop downs

These are just the simple cases.
---
 gtk/gtkprintunixdialog.c     | 23 ++++++++++++-----------
 gtk/ui/gtkprintunixdialog.ui | 12 ++++--------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index a243c9f5ad..ff93d95a12 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -1580,8 +1580,8 @@ set_paper_size (GtkPrintUnixDialog *dialog,
             {
               gtk_combo_box_set_active_iter (GTK_COMBO_BOX (dialog->paper_size_combo),
                                              &iter);
-              gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->orientation_combo),
-                                        gtk_page_setup_get_orientation (page_setup));
+              gtk_drop_down_set_selected (GTK_DROP_DOWN (dialog->orientation_combo),
+                                          gtk_page_setup_get_orientation (page_setup));
               g_object_unref (list_page_setup);
               return TRUE;
             }
@@ -1603,8 +1603,8 @@ set_paper_size (GtkPrintUnixDialog *dialog,
                           -1);
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (dialog->paper_size_combo),
                                      &iter);
-      gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->orientation_combo),
-                                gtk_page_setup_get_orientation (page_setup));
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (dialog->orientation_combo),
+                                  gtk_page_setup_get_orientation (page_setup));
       return TRUE;
     }
 
@@ -2218,7 +2218,7 @@ static GtkPageSet
 dialog_get_page_set (GtkPrintUnixDialog *dialog)
 {
   if (gtk_widget_is_sensitive (dialog->page_set_combo))
-    return (GtkPageSet)gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->page_set_combo));
+    return (GtkPageSet)gtk_drop_down_get_selected (GTK_DROP_DOWN (dialog->page_set_combo));
   else
     return GTK_PAGE_SET_ALL;
 }
@@ -2227,7 +2227,7 @@ static void
 dialog_set_page_set (GtkPrintUnixDialog *dialog,
                      GtkPageSet          val)
 {
-  gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->page_set_combo), (int)val);
+  gtk_drop_down_set_selected (GTK_DROP_DOWN (dialog->page_set_combo), (guint)val);
 }
 
 static gint
@@ -2949,16 +2949,17 @@ custom_paper_dialog_response_cb (GtkDialog *custom_paper_dialog,
 }
 
 static void
-orientation_changed (GtkComboBox        *combo_box,
+orientation_changed (GObject            *object,
+                     GParamSpec         *pspec,
                      GtkPrintUnixDialog *dialog)
 {
-  GtkPageOrientation         orientation;
-  GtkPageSetup              *page_setup;
+  GtkPageOrientation orientation;
+  GtkPageSetup *page_setup;
 
   if (dialog->internal_page_setup_change)
     return;
 
-  orientation = (GtkPageOrientation) gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->orientation_combo));
+  orientation = (GtkPageOrientation) gtk_drop_down_get_selected (GTK_DROP_DOWN (dialog->orientation_combo));
 
   if (dialog->page_setup)
     {
@@ -3548,7 +3549,7 @@ gtk_print_unix_dialog_set_embed_page_setup (GtkPrintUnixDialog *dialog,
             g_signal_connect (dialog->paper_size_combo, "changed", G_CALLBACK (paper_size_changed), dialog);
 
           if (dialog->orientation_combo)
-            g_signal_connect (dialog->orientation_combo, "changed", G_CALLBACK (orientation_changed), dialog);
+            g_signal_connect (dialog->orientation_combo, "notify::selected", G_CALLBACK (orientation_changed), dialog);
         }
       else
         {
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index b1ad70be9e..eeb4891269 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -519,11 +519,9 @@
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBoxText" id="page_set_combo">
+                                      <object class="GtkDropDown" id="page_set_combo">
                                         <property name="valign">baseline</property>
-                                        <property name="active">0</property>
-                                        <property name="entry-text-column">0</property>
-                                        <property name="id-column">1</property>
+                                        <property name="selected">0</property>
                                         <items>
                                           <item translatable="yes">All sheets</item>
                                           <item translatable="yes">Even sheets</item>
@@ -708,12 +706,10 @@
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBoxText" id="orientation_combo">
+                                      <object class="GtkDropDown" id="orientation_combo">
                                         <property name="sensitive">0</property>
-                                        <property name="active">0</property>
-                                        <property name="entry-text-column">0</property>
+                                        <property name="selected">0</property>
                                         <property name="valign">baseline</property>
-                                        <property name="id-column">1</property>
                                         <items>
                                           <item translatable="yes">Portrait</item>
                                           <item translatable="yes">Landscape</item>
-- 
2.30.2